Merge tag 'upstream/0.9.0' into debian/sid
authorLuca Bruno <lucab@debian.org>
Sat, 7 May 2016 15:29:14 +0000 (17:29 +0200)
committerLuca Bruno <lucab@debian.org>
Sat, 7 May 2016 15:29:14 +0000 (17:29 +0200)
Upstream version 0.9.0


Trivial merge